(unwind_create_frame): Return t if frame was deleted.

Don't alter tip_frame or tip_window.
(unwind_create_tip_frame): Set tip_frame to nil only if frame
was deleted.

diff --git a/src/w32fns.c b/src/w32fns.c
index 37aaf4238f1d4f7c5295a0f115e3dab4edf90b79..c11f66b8a03745dd07a8c5da4647da2ed9d34924 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5139,9 +5139,8 @@ unwind_create_frame (frame)
       /* Check that reference counts are indeed correct.  */
       xassert (dpyinfo->reference_count == dpyinfo_refcount);
       xassert (dpyinfo->image_cache->refcount == image_cache_refcount);
-  
-      tip_window = NULL;
-      tip_frame = Qnil;
+
+      return Qt;
     }
   
   return Qnil;
@@ -12227,9 +12226,16 @@ static Lisp_Object
 unwind_create_tip_frame (frame)
      Lisp_Object frame;
 {
-  tip_window = NULL;
-  tip_frame = Qnil;
-  return unwind_create_frame (frame);
+  Lisp_Object deleted;
+
+  deleted = unwind_create_frame (frame);
+  if (EQ (deleted, Qt))
+    {
+      tip_window = NULL;
+      tip_frame = Qnil;
+    }
+  
+  return deleted;
 }
 
 

diff --git a/src/xfns.c b/src/xfns.c
index 0def9ac3af5d09920f47b26d0c651a670e3143cf..ab4f288cb011116b0a0398ed2b8adeace5e876c2 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4052,9 +4052,7 @@ unwind_create_frame (frame)
       /* Check that reference counts are indeed correct.  */
       xassert (dpyinfo->reference_count == dpyinfo_refcount);
       xassert (dpyinfo->image_cache->refcount == image_cache_refcount);
-  
-      tip_window = None;
-      tip_frame = Qnil;
+      return Qt;
     }
   
   return Qnil;
@@ -10357,9 +10355,16 @@ static Lisp_Object
 unwind_create_tip_frame (frame)
      Lisp_Object frame;
 {
-  tip_window = None;
-  tip_frame = Qnil;
-  return unwind_create_frame (frame);
+  Lisp_Object deleted;
+
+  deleted = unwind_create_frame (frame);
+  if (EQ (deleted, Qt))
+    {
+      tip_window = None;
+      tip_frame = Qnil;
+    }
+  
+  return deleted;
 }